Merge from trunk
authorJason Rumney <jasonr@gnu.org>
Mon, 11 Jan 2010 14:34:47 +0000 (22:34 +0800)
committerJason Rumney <jasonr@gnu.org>
Mon, 11 Jan 2010 14:34:47 +0000 (22:34 +0800)

Trivial merge